Merge version 13.8+rpi1+deb13u2 and 13.8+deb13u4 to produce 13.8+rpi1+deb13u4

diff --cc debian/changelog
index a2eb413dd019f41518e21a46720b986260765f9d,3e2419f9fe5d0150ee5670f0ed5d5570c01da7d4..a4ac81200de294a785f9ab3a28264b95690d6356
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,14 +1,32 @@@
- base-files (13.8+rpi1+deb13u2) trixie-staging; urgency=medium
++base-files (13.8+rpi1+deb13u4) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 8+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 07 Jan 2015 02:03:42 +0000]
 +  * Modify default vendor etc for raspbian.
 +  * Modify maintainer scripts so default will be set to raspbian even when
 +    upgrading
 +  [changes introduced in 10+rpi1 by Peter Michael Green]
 +  * Make some changes using sed in debian/rules rather than directly in source
 +    package to avoid merge conflicts.
 +  [changes introduced in 10.3+rpi1 by Peter Michael Green]
 +  * Make further changes in debian/rules rather than directly to files in
 +    package to further avoid merge conflicts.
 +  * Make changes in debian/rules in the "install" step to avoid the need for
 +    code to revert them.
 +  * Add build-dependency on moreutils to support new code in debian/rules.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 09 Jan 2026 14:58:45 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 17 Mar 2026 20:32:33 +0000
++
+ base-files (13.8+deb13u4) trixie; urgency=medium
+ 
+   * Update debian_version and os-release for Debian 13.4 point release.
+ 
+  -- Santiago Vila <sanvila@debian.org>  Mon, 02 Mar 2026 22:50:00 +0100
+ 
+ base-files (13.8+deb13u3) trixie; urgency=medium
+ 
+   * Update debian_version and os-release for Debian 13.3 point release.
+ 
+  -- Santiago Vila <sanvila@debian.org>  Fri, 02 Jan 2026 13:35:00 +0100
  
  base-files (13.8+deb13u2) trixie; urgency=medium